Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Mon, 24 May 2010 22:47:09 +0000 (22:47 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Mon, 24 May 2010 22:47:09 +0000 (22:47 +0000)
commitc1c379483451a3187d98309e9237632906826c65
tree430a882f77f1c0a1a78cb3ed78ab06fb152a192e
parent669c1c336a904e272078689d7f2cad5b1a4d9e39
parenta2bf2cbc37f47c9c61be7ec83b7cec8dd6d8d789
Merge from mainline.